Refactor: Remove redundant/blocking code paths