cleanup, removing stuff previously commented out, etc.