Cleaned up unused includes