Removed some excess functions.