More code clean up and simplification.