Remove dead code and update .gitignore

Remove dead code and update .gitignore