Removing duplicate branch logic
More cleanup