removed useles code