style tweaks to eliminate some screwy tables
removing the deprecated calls