fixed import bugs, removed credentials from session (there is no need for them there)