Another Small Parts Clean Out

Al, next in line for #16 please.