Remove all @Single-related content (deprecated)