remove some cruft
:+1: add some more datas