Added abitity to remove workspace fields