Initial cleanup. Some modules must still be probe-ified