Remove some deprecated and unneeded stuff
Merge pull request #515 from twitter/deprecated-clean

Remove some deprecated and unneeded stuff