CLEAN OLD DEPRECATED CODE

removed crap