Removed unncessary code