deleted obsolete files
Exception handling tuned