remove defaults accidentally committed and change parameter types to work on EC2 classic