cleanup, simplification