fixing last warnings and reverting unused parameters