Fix filter manager & remove unused file