using CTP parents and neighbors now, deleted few obsolete components, resolved/deleted few minor TODOs