Cleaning out some parts

PM sent