HA - removed few not used lines