Additional cleanup and removal of user-specific paths.