Removed unnecessary param from handlers