Final CleanUp for Version 1.1