Add tables
Remove unused form class