Remove references to addon stuff