Removed logical checks behind switches