Remove unused parts