Removed class existence checking