Beginnings of the process cleanup (bug #1)