Remove dependency on xinput