Clean up top-level singleton methods