you are right we should remove this stuff ...