Removing unused code, added *~ to .gitignore