Finally the clean up of this freaking cases.