-- GEP-6, code cleanup and added missing file