Add support for photo shelf and remove unnecessary code