Cleanup: remove duplicated code.