Remove the redundant method
Modify comments