Removed innecessary code