cleanup and make proper .gitignore

Cleanup