Cleanedup extra parts