Kill noncontroversial methods

https://www.pivotaltracker.com/n/projects/684825/stories/79452850