Updated to remove ~ temp files