remove old, duplicate files and fix gitignore