removing two no longer needed functions