Remove extra checks