some modification with build script and make file
merge with remove