GNR-7 cleanup
GNR-7 bugfix
GNR-7 added object remove for optivo