AccounVector id changed, useless classes removed