fix compile
cleanup