port RF-13160, remove images, fix imports