removing uneccessary code