cleanup unnescessary code