Removing commented out code

This change is more complex than I'd realised and is not necessary now, so remvoing the changes and have raised a pivotal story for when it does need to be done: https://www.pivotaltracker.com/projects/367813#!/stories/44548441