Removed binaries and integrated more steadily in MTO