cleanup, no functional changes