more manual stuff removed