Today: continued researching the codebase, removed...

# python-contributors

[SerVB]

Today: continued researching the codebase, removed and renamed some stuff (PR).

Next time: want to continue for one or two weeks, this research still looks useful to me.