remove unused code
Add autoscaling tests