Cleanup and removed a bug I introduced during merge