removed superfluous code and comments