more clean up in system class