CLEANUP: Simplified HTTP handlers.