Move ENV guards to tops of files
Require pg