some cleaning up that should have been in the last commit