Fixed verbose output, removed unused code.

Made the verbose output configurable by make statement. Removed unused
code.