Removed un-needed functions