Refactor technical debt, clean up.
Activity