Remove unnecessary code
Improve lint