Remove not needed functions for now