(fix) Clean up user and services