removing obsolete scalar code