support for custom activity
cleanup