(Very little) code cleanup.

- Deleted some toxic code (no more torture!)
- Corrected some resource issues