move stuff to the wrong place
remove comment