Clean up and simplify.