removed extra modules & minor changes in samples