Memory leak fix
Small fix
Add remove history for world