Remvoe some unused