Build procedure refactoring and strip fix