remove datamapper and move light cache