- Removed unused code
- Updated EC2_INSTANCE_TYPES list so filtering from command line will show the right types
- Made sure to clean instance type names from JSON which contained an asterisk.