Removed unnecessary (commented) code