Fix multiple divider on rebuild()

Divider was not removed on rebuild so each rebuild would add a new divider.