Some clean-up of manipulation tab