Removed temporary checks