Safehouse 2.0 !

Removed whitey on hero as well.