Remove custom location properties

But not the scaffolding because this will come back soon and we might
want some of it....