I would remove that class and the confusion and use the main system activities class
@zacc ?