Removed unused checks