Revert extra code, fix branch