Some cleanup now that it works