CAL-941 Remove deprecated usage of CalBrowser