1494 | Sync unverified data from mobile to server

Part 1 - Cleanups. Merging now to prevent conflicts later.