some cleanup, no significant changes