Even More Cleanup
Merge branch 'steven' into development
Merge branch 'development'