Cleanup

@TylerSheffels (can review commit by commit)