Some left over stuff from previous commit