Removed unncessary functions