Clean up things and simplify.