Clean up beams module. Make nonlinear bucket work again.