Fix NPE seen in dev, remove unused method