Revert "Restructuring and deleting unused parameters."

This reverts commit f752b3684d04069906596d5560969477a203dcf9.