Removed unwanted stuff
Merge with Hoan