Fixed some git issues and removed some old commented code