Cleanup and move message signing