3d-support and remove plotting.