Remove cruft
Rearrange calendar views