speed up and clean up.