Removing all this crap I accidentally cp'ed over from nn