Cleaning up removeValue.