Features/clear notifications#14