CLEANUP: Added obsoletes to a few old methods
Deleted some methods