Some cleaning regarding the last patch.