cleanup, bringing in newer stuff