Stopped classes of -NONE- being accepted.
Removed occurenaces of -NONE- class