Removed InputFilter class. Minor improvements.