Fix compilation bug for python module
Remove some dead code
Fix MacOS compilation bug -- apparently includes from parent classes do not propagate