Add cleanup.
Tags now get added.
Block devices are now added as well.