Cleaning gitignore and Sami configuration