get rid some yellow code