Removed excessive function.
Fixed defect with -a argument, which matched to wrong names.
Cleanup.