Old plugins removed
More improvements