Cleanup old file location
Fixed an issue with tableView delegate caches (use immutable surrogates now with nil propagation)
General cleanup
Fixed message forwarding issue