Misc cleanup

Including the removal of bad behavior/probe copy