Refactor on model, specifically removed some unneccessary data in filtermodel and adaptive filters