Move add/removal functions to expandable inputs class itself