added del statemetns to remove unused parameters