Clean up the modules (Fixes #69, #70)