Code cleanup

https://www.pivotaltracker.com/story/show/65570296