Unused code deleted. Filtering fixed.