Final cleanup for the base schema, re search_path ... I hope