Removed empty if cases