Fix Removing Result classes + Model ClassNames