some cleaning up, no code changes