Further cleanup
Commit compiles