Remove commented code, fix roles syntax