Removed unused params;