removal trash code
no switch statements