Remove non-working aliases, changed specifc things to system variables