That was buggy, but now seems work.
Remove old code
Error in constant
Cleanup comments