cleanup, refactoring, remove mirror supports