removed some unused things