commented legacy stuff removed