Removed unnecesary code