VE-1333 Fixes from CR. Removing unncessary items