V5 : Cleanup for building from scratch