Warnings fixed, `with` removed