Removed the case statement