Pulling in active R&D package as starting point.
Removing unused code.