pre upgrade linkset commit
code cleanup