Clean-Up

Not needed flags, not implemented flags...