Adding tokenHandler service & cleaning services instanciation