Removing some unused things