removing not relevant code