removed some unused stuff and added other stuff