Remove not needed anymore function