Cleanup
Get rid of a few unused macros
Move signature.h to backup