Removing data-tables
Removing some direct use of java