[IMP]:Remove filter and Improve code