STS-3433: Clean up dependencies to Batch feature