fix protect
wip cleanup