Cleaning out some parts

PM Sent