Removed unnecesary functions