Some more cleanup and simplification