Removed unused parameters from former draft