Removed redundant includes, performance concerns