0.1.615 Cleanup Part #1