clean up w local settings
pre merge
fix lazzor merge