Cleanup Fixes

- Convert old methods to Cryptor objects
- Remove old debugging statements that crept in somehow