More cleanup for turpial ebuild