remove pm and domain code (they are now in pypm)