deleted NeuroTools code
resolved marge conflicts
final fixes