Clean up removing unused scaffolds and tables