Removed all reaming smartpointer of unit.