Remove former version
Amend build script
todos