Removed dependency on nerd core