Cleanup
Started writing services tests but got drunk