Minor updates/removals