Cleanup branch

Move location and gallery to own branch
More branch cleanup