Removed unuseful checks