Delete Util module and create class filters