code cleanup finished, for now