Remove unnecessary code.
Remove event from calendar when necessary.
Merge branch 'feature/CleanupRedrawHandling' into develop