Fix cyclicals and strip right