Cleanup
- reducing whats needed in definition.json with reasonable defaults