removed some more functions.