Remove hard dependency on camlp4 / remove deprecated modules

Mergeable; please review.