Starting with some prototype cleanup.