removed some more functions