clean up without new roles and cancan