Removed useless uses of switch module