Cleaning out some parts

pm sent