TS-2082: remove FIXME_NONMODULAR defines
TS-548: remove Initialize.cc Initialize.h
add TS-2386