FIX: cleanup of the build scrips