fixed unused parts