removed inactive logic