[#1012] Cleanup