security view clean up (wip)