module cleanup in prep for drupalbase