removing .DS_STORE and tidying up some gitignore rules
fixing failing test
fixing failing test
removing unused code after refactoring