Cleaned up SimPy layer.