Cleanup and preparing for 2.4.5