deleted things not needed for 2.0