TMI-32: Cleanup after merge. Removed filter + code style changes.