Cleanup... bits I missed...