Removed class existence check