Refactor: Remove clutter, dead code