Note: This part wasn't a fix, just a cleanup.