Improve Editor performance

Remove unnecessary logging, add null checks