refactoring code in preparation for login form
 - removing unused imports