Additional changes for cleanup ..