Converts README examples to the new mask technique. Also fixes some unused imports