Removed dead commented stuff