Do not apply conversion to non properties units
Remove not used code path
Move post update cleanup to separate method