Removed some unncessary functions.