Get the Env Cleaning working for DATE and AMORE