clean up and add postgres