Remove unnessary functions