Even More Cleanup
Merge branch 'steven' into development