remove some ghettoishness - still lots there