removing useles code