Removed Depreciated crap
Removed unues TODO's