General cleanup for stability.