Removed all the obsolete methods
Thanks @squeek502