Fix minor issue in an assert
Cleanup some unused ivars
More cleanup