Got rid of SafeActivity