removed unuseful variables