More removing internal filter stuff