Clean up references to removed code.
Add back FDRCSpatial2 optimizations.
Adding back in needed classes.