Core: Get rid of unnecessary switch statement in Kernel