Removed DB, and fixed GDATA Dependencies