remove list -p, some cleanups