code cleanup left from last commit