got rid a of a few unused parameters