Cleanup unused files and code

- code useful in the future is commented