some changes, get rid of useless stuff