General Cleanup, removal of old comments etc.