Remove not needed functions