final version

removed some unnecessary code