Comment out unusefull checks