Removed duplicate code
updated build tools
update build tools