Small cleanup tasks

Remove additional properties files and revert DB2Environment