Cleaned up ande removed some unnecessary includes