Fixed strange 0 | FLAG add in flag values
* removed some code left behind