[NUCNEOFORJ-49] Further cleanup of Table/Column code