some code cleanup in brand safety and removing some test views