More tidying of core module stuff, mainly removing templates