Remove unnecessary and annoying aliases