Minor cleanup, removed some includes