Improved Sami setup
Removed Sami, it's too poorly documented