Removing mildly weird code

Unnecessary switch/forEach removed.