Add missed pumphouse.base
Enable disabled services on cleanup