remove these field until golive