More cleaning, reducing
cleanup