another round of addon cleanups