fixed #713
removed obsolete stuff
fixed  #706