Removed tmp
More Cleanup
More Cleanup