Latest Changes and Cleanup