cleanup of obsolete stores and interfaces