Fixing class comparison to nil. Removing unnecessary __unused flag.
Merging from jonas master