Remove width
add paverment.py from upstream