Removed the deprecated of classic shelf related code