removal of unescceary code