removed a few lines