Deleted old commented stuff