Remove old stuffs
Code from 3.2.1 version, from mid-2012