removed API
minor refactoring for 1.5.0