[USER] Cleanup signals a bit