Clean-up Activity

Clean-up Activity