Support for new experimental update, some refactoring.
File cleanup
More file cleanup