Removes erroneous blah blah blah and defines API better

Change-Id: Id1f1718ea2bcdd410f030f553c65f8020ea0c650