Cleanup dependency between modules
Add calendar managed resource