removed Unused things