Fixed Calendar and removed Maps / Suckunotes