KAA-280: Remove unnecessary code in the user submodule