Cleaned up postgres/connector-manager