#25 remove use of activity