Removed old discipline filter code