Remove this silliness