Removed unused return, views fixed and also third place where it expects None