remove non-GPL code
use libraries module