Refactor for 3.0, extract API etc
Remove @Override from clear(), javadoc update