Revert "Final Database access code"

This reverts commit 85d2d867eb4fd5d4afd519f0bdc5a92ed792816d.

Conflicts:
	Database.java