Cleanup 9.2 class and change procpid to pid