Cleaned up API routes