Shane: clean up