Clean up
Removed -d option and 'c' command