Small bug fix for NuCraft and cleanup