Removed some unecessary functions