Resolved database setup issues
Got rid of build cruft