Further API route cleanup