Additonal clean up changes