Tweaking, organization and removing kruft