#10 cleanups