some cleanup of the mess I made