Cleanup, simplification.