Remove dependency on integration of RTC for now