removing unused modules & fixed code error