Yeah I had a similar experience on a smaller scale, reducing a function from 125 lines to 25.