Remove unused variables and headers
Remove unused function
Python version - easier to play with