Made some notes in bugzilla about this, I think we are ok to remove them.