Removing chunks of old code, as the refactoring got to the good enough state.