Cleanup for Version 1.1