code cleanup continued