clean up commoncore.py