removed some unwanted functions