[0.3.2] old stuff removed