removed useless completion handlers
removed test data