Clean up for easier maintenance in future

[ivystopia]

• Normalise user data as soon as it arrives
• Remove things that are not used currently, or are commented
• Move a helper function that should always have been placed in utils

[ivystopia]

I've been running this branch for about 3 days with no issues