Remove not needed cases