remove debug lines.
Update to use the correct header, per updated documentation.
Refactor to a common Resource core :).