Cleanup some residual stuff