Fix bug with includes

Remove unused includes