Simplify setup_extra.py