Performed some cleanup and uncommented createActivity() jobs