Misc. Cleanup.