Cleaned up to-dos from problems caused by Jython
Removed to-dos that no longer apply