remove and simplify baseline addon