First client-server version on par with the old features
Old python code cleanup