Dropping Legacy Code - Third and final session of changes

This should include all modifications for the first round of Legacy code.