Day 5 cleanups