Vision: Refactor existing code, remove garbage