Remove extra logic and request flag