Remove code for other libraries and update tests