finish calendar related controllers and services