Clean up some moar

Also, Omsk