More annoyances removed