Removed Logout code and unnecessary include statements