Cleaning up for 4.1.2-Release