Quick Cleanup items

https://basecamp.com/2726966/projects/6849643/todos/142155297