get rid of some yellow code