Removing uncessary functions