Fix swig bindings & remove useless classes