Code cleanup: correct include
Code cleanup: unused args