Improving usage message

- Also some unused code deleted