removed all unnessary