removing redundant or not-needed stuff (let me know if how to acces something is unclear)

There are compile errors here, probably messed up conflicts resolutions (yade namespace?). We can at least compare the two branches with this MR.