remove unnecessary filters & functions