Remove code not related to this branch