signatures cleaned up