Clean up table classes
Clean up form stuff