Restructuring and deleting unused parameters.