[master] Cleanup.

Just removed some old junk :)