Model cleanup

Maybe we should replace location with a flag which indicates if the source is the Nokia S40 mobile app.