fixes and removing nb folder