remove deprecated functionality
add integration test