Removed more unused includes