Remove unused varialbles
Ignore include in client files