removing some unused things