Some cosmetic changes.
- Removed unused options
- Removed extra functions for patches.
- Added type=file.