fix compile warning / cleanup