Deleted unused parts