Remove pg etc. as services can be used