Code cleanup. Intialy process filter avail.