Cleanups and base64 moved to utils