ECL-272 cleaning up