removed some unused parts