Removed todo
Clean up warnings
Remove fixme comment
Use BasicDatabaseTableBuilder insted of Java specific one
Clean up ToDos
Refactoring after moving of classes