removed uncecessary code