get rid of unused syntax elements
fix logic.vec