remove redundant code
layout cleanup