Add comment form and remove unneeded fields