Some cleanup
More Cleanup