Revert "Addons"

This reverts commit e3b3954d75265a34bae1f7293f383017887c4b8e.