removed a few more warnings and unused parameters