removing manual check