Never appears to be used, remove?