Issue #29: Removing Python code, greating simplicity in C code