Remove s118 and s119. Move s085 to db dev