remove old code
modifications recommended by jhass