clean up major wastefulness