Removing unused columns see BT#7139