Clean-up from v1.5.0 update.