Cleanup

Removed depricated code that snuck into last commit. Sneaky ninja code..