Remove unused tables, JPA equivalents