Merge "Drop setup.py and setup.cfg"