Removing epatches changes

following the fork