Cleanup remove useless field