Why were all these removed? In general you've left quite a bit of commented-out code throughout these changes. If the code isn't needed anymore we should delete it. It will still exist in version control and keeping it makes the remaining code harder/more confusing to read.