Cleanup and Remove the blocker...

Didnt complicate things enough.. Not a great idea.. :D