get rid of Activity class