Remove commented code
Refactor plan-state passing in lift
Fix 'unkown' removal in os detection