fix changes, remove dynamic elements