Remove unused code
Add test activity for service with timing