Remove modules that sneaked in this branch