clean up  + opti