remove unnecessary branch hard coding