More simplification and cleaning up