1 13 cleanup

Yes, it's all working now.