Remove unused files
Expander impl