Removed unecessary functions