Removed useless function and slight edit in struct
Get to solve the merge conflict