CleanUp 6.0.3 handlers