Clean unused code
Implement IR in tank and states