KAA-280: Fixed TODOs and FIXMEs in the user submodule