A few smaller things removed as they have been moved over