[1.3.2] Cleanup