Syncing with epatches

after cleaning out functions