Removed unused params