some minor tidy ups. removed the logoutUser again. was wigging out.