fix bug and remove unnecessary field