Please, remove dead (commented out) code