Remove cruft + add postgres