more functions removed