removed unnecessary (commented) code