Removed unused functions that were not valid anyway