Riviera Beach: Is the controversy over?