Only transition some properties + cleanup