[CHANGE] some cleanup on api;