Removed unused value object types