0.0.12 Cleanup Part #1