simplifying to use regular activity, removing commented code