MAINT: Remove deprecated code for 0.6 #2035

Merged
merged 10 commits into from Oct 9, 2014