cleaned up unused parts