Clean up signature logic