[1603] Further extraction of contacts and laboratory, cleanup