Space cleanup and inclusion of MoleculeMap