removed modules that extends basic to exclusively use p2