Cleanup2

More Cleanup