Additional cleanup and our current php backend and pgsql database