Refractor: Removed unused includes