remove testing 'return YES'