Few small shortcut changes, comment out unused/misbehaving plugins