Cleanup. Starting work on tracking activity