Clean up: use the library