Clean up

Some more cleanup and simplification.