[ticket/382] Remove unused code and fix logic issue

B3P-382
[ticket/382] Clean up calendar module

B3P-382
[ticket/382] Clean up custom module

B3P-382
[ticket/382] More code clean up

B3P-382
[ticket/382] Clean up in module base

B3P-382
[ticket/382] Code clean up in modules

B3P-382