removed deprecated code (commented out earlier)