Remove unnecessary addingComponent and clean up removeById