Cleaning up references to home dir