cleaned some ported stuff in unit class