More cleanup, prep for build system
Remove trailing chars from build name