- Cleaned up warning-generating code

5 files changed