Removed some deprecated stuff.
Added filter to remove 'secrets'.