1.5 cleanups