Clean up loose end until I can finish