Cleaning out old module stuff