Removed unnecessary header includes