Clean up comments and extra tables