UI cleanup and resource cleanup work