Cleanup
More simplifications