Remove obsolete optparse import
Merge branch 'remove-remnants'