Cleaning up legacy comments