remove useless code
+ new smaller version