General cleanup and stability