clean up; reduce build warnings