Cleanup
fix can/view/modifiers