removed some superfluous #includes