Removed several not-necessary inclusions

This is the draft version that I prepared and that we will use as
a starting point. Still it is a bit dirty, and I will try to improve
documentation and delete unused routines