- remove callbacks (functions are sync) - update tests for removed callbacks - minimize some code duplication