Removed some cases