Helps CC-1248: Code review comments
Helps CC-1248: Code review comments

remove() function is unused, so get rid of it.

control-center/serviced,control-center/serviced,control-center/serviced,control-center/serviced,control-center/serviced,control-center/serviced,control-center/serviced,control-center/serviced