Refactored to remove unneeded manual 405 responses