removing unneeded switch