Remove unused declarations, change from set_prop to clear_prop