Removed some unrequired methods