Cleaned up basic database stuff to use AWS