modify to use macro-form-p instead of removed macro-p
remove unused functions
remove an unused binding