Clean up the molecule code
Clean up the molecule code

gitesei/faunus,bjornstenqvist/faunus,gitesei/faunus,bjornstenqvist/faunus,bjornstenqvist/faunus,gitesei/faunus,mlund/faunus,mlund/faunus,mlund/faunus