housekeeping - getting rid of unnecessary code