removing unnecessary and not working stuff