removed unused checks