more build file cleanup/updates