Code clean up.

Conflicts:

	binaries/struc_learn_prep.cpp
removed obsolete classes