Deleted unused service class
Deleted unused template activity class + helper classes
Minor import cleanup
Cleaned up dead code + added some reference