RELEASE
API cleaning