remove colorline and a bunch of redundancy