Fix the MetadataController blacklist and move mechanism, and start the stored removal code