Resolve aliasing issue
Removed useless references
merge