Pre-deploy commit. Minor clean up