Clean up from Justin's CR