Clean up REST handlers
Fix conflict in core.py