Clean up code from af5ceb9976279b8f6e678c7761995206792de030