Remove old, (not used) functions