Removed location and addressfield and updated demo content to reflect current status of content type