Cleanup
More cleanup
Remove leftover serializer code
Remove unnecessary usage of references
Remove references to references