Remove dependency on Serpent module