filter tweak
remove a bunch of (now) unused classes