Removing not needed stuff.
Quick API definition.
Minor
Merged?