Cleanup on the corner of @mattbasta and @cvan