Revert "Many changes because database was created and a rebuild for java class was necessary"

This reverts commit 4d3832fc0965d2f16bf8288753d88ab4855f5471.