unwanted functions removed