Merged Changes and Cleanup