Minor cleanup
Remove Nose code